]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
ci: Fix checking out mutter for stable branches
authorFlorian Müllner <fmuellner@gnome.org>
Tue, 23 Apr 2019 16:36:35 +0000 (16:36 +0000)
committerFlorian Müllner <fmuellner@gnome.org>
Fri, 26 Apr 2019 19:32:51 +0000 (21:32 +0200)
Remote branches always start with the remote itself, so just looking
for "gnome-3-32" etc. won't produce a match.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/509

.gitlab-ci/checkout-mutter.sh

index 6539d80ea221a194cf9cf58fde4e96849336caf1..7eb5c29740e82b45d7e646b684d0cea887ee8f02 100755 (executable)
@@ -23,7 +23,7 @@ if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" ]; then
 fi
 
 if [ -z "$mutter_target" ]; then
-  mutter_target=$(git branch -r -l $shell_branch)
+  mutter_target=$(git branch -r -l origin/$shell_branch)
   mutter_target=${mutter_target:-origin/master}
   echo Using $mutter_target instead
 fi